Merge stage-aosp-master into pi-dev-plus-aosp Bug: 126125118 Change-Id: I74cb93a460c0ec02a11b222072c07941cbff21d8